Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Mar 2010 15:03:20 +0000 (15:03 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Mar 2010 15:03:20 +0000 (15:03 +0000)

Trivial merge